more cross-compilation changes (CPP was a bad var name choice)
fix constructor, more debugging
mostly formatting