Fixes and things im guessing late commit