Added TODO-comments and more parsing rules