Fixed include list
Started work on #534, also fixed #427
Almost done with #534
Yay for manual merging