Fixes

May fix the stuff. MAYBE!