Minor changes, added commented sections for local use.