Added comments and housekeeping and stuff