quick bug fixes
more quick fixes