Refactoring and cleanup.
all modification now carry date/time stamps