bug fixes, other things