Extra tweaks
Lots of changes now compiles completely from source.