many little fixes
one more fix
fixes more fixes