cleaned up includes
everything works
merged modified code to master