Added comments, minor changes