Fix ALL THE BUGS! (probably just two actually)