added map comments and clean up everything