Just a few changes for better usability.