Fixes and bugs, great times!