Update maps.jk and sample.jk to new syntax
Fix parser bugs