Updates from testing and bugfixing.