Add the rest of the syntax issues, should have ack'ed first