Various changes
Initial second style commits
Remove Stasis compile
Switch port