port fixes from my old repo

All minor changes, mostly a test of the process to update the app in the pebble store