Fixed some bugs and fixed Controller and Step Mode. Also fixed clone method