Many syntax improvements, as well as some callback improvements over errors. #9