Bug and syntax fixes
Syntactic sugar & making Environment look nicer