made better use of the ! optional unwrapper. Now more safe with optionals
removed unnecessary enum name when setting the value
Merge branch 'feature/fix_bugs' into develop