some quick-fixes done