Some bug fixes, but problems remain