changed include directiories, fleshed parser out abit