Cloning + other fixes

State Start&End