more rotation work
some more fixes