Small speed improvements and added some time usage data