Fixed a lot of issues, mostly works