includes fixes
39 complete
40 complete
41 complete