added keywords, added some parsing methods