Comments added. Cleanup done.
merged Riley-Branch