Fix ALL THE BUGS!