Added productivity and other fixes.