Updated definitions

Added formals, some expressions and features