changed the order of included files and uncommented some includes