moving wrt boundaries working

and other minor changes