moving general info to includes; adding map; general cleanup