bug fixes

fixes all reported bugs and a bug i found while trying to fix a reported one. thank you for your patience