Cleaned code
Fixed 'always save on manual' error