Add some docs and improve syntax