delay moveable object creation
Fix conflict with origin/master, remove windows
carriage returns.