adding final touches to app hopefully for the last time