Updated comments and some other minor changes