Various performance tests
got rid of tits
added buttons back in