round two beta bugfixes