Commenting work and some small bug fixes