Added comments, updated WFF grammar