added proper syntax table and other cleanup