Fixed a parser problem with access type field injection, extended the terrible CLI to be more useful (still terrible though)