Final real code commit, begin commenting and final bug check for [2.1]