More syntax cleanup. Add some more spec tests and TTL params