tapmove and numerous other fixes