bug fixes, more problems