some minor fixes, more to come