Last major commit

All files commented, some small bug fixes