fixes
fixes
added reference
cleanups