Merge pull request #323 from ThePyrotechnic/Dev

general bugs
fucked up