Many changes, some broken, but mostly a fixed build

Many changes, some broken, but mostly a fixed build #37