changing the .pro
fixing a merge
added timing to User Interface