Finished tweaks, this will be published as v2 (1.1) of the app.