major cleanup and docs push, workaround fix for bug #2
merge