Made it work

Fixed a lot of things