Misc changes
First steps (parsing) towards additional preconditions and effects