Performance improvements, bugfixes. Preparing for day 1 2014