some enhancements, simplifications, etc.
cleaned out some unneeded compiled code