various changes.

Project seems to be 100% functional at the moment.