Fixes, changes, etc.

Almost ready for final build