pack up includes and fix maze