more fixes, more to come