bug fixes, pre_alpha