refs #10 improve moving and some minor fixs