Updating comments, making small tweaks