Comments and small bug fixes