Lots of changes

Been a long time since last commit. Lots of changes.