Return success, and other stuff
update
more fixes and improvements