Some cosmethic improvements.

All base functionality completed. Freezing of code base.