Added more layers, documentation code cleanup.
Some final commits before submission