Small syntax changes, fixed scanner bug