some general adjustments for the move Method
added changes from master
added some more
finished move method
merge preparation