bug fixes to first beta