final functional changes to the app