Fixed checkin, added some comments