Further updates to basic app.