bug fixes, more to do