bug fixes to updated architecture