more comments, tidied up a bit