Bug Fixes and shit

i mean shite, less offensive