Minor modifications to comments and stuff