Issue66

Fixed a lot of stuff