Lots of updates to app