Fixed breakage! All of it! :D