small changes to comments and functionality