Revert symbol assignment time
Correction collecting & setting symbols
Rollback of the environment in case of error (we really, really need a code formater)