Made enumerations consistent with our Java represantation, because this way it's easier to handle them from the front-end
Minor fixes
initial commit