More syntactic sugar
More code cleaning + testing
Fixed some bugs