More bug fixes, uploading to test with Pebble App