start fixing includes, and tidy up