bux fixes, test improvements, re-enabling tests, tons of cleanup, other