Lots of comments

also fixed time kludge