Fix various: 20141216

Would be good to assert that the app has started correctly, e.g. by copying lines 83-86 here