Fixed a ton of bugs only to add more