Better Commenting, Some Map Stuff