parsing improvements, got rid of metatypes