Fixes

Fixed basically everything -.-