Fixes & more fixes

Fixed some more shit to make server file smaller, way smaller