Fixes fixes and new shit