Misc stuff
Made stuff more resistant