Fixed slowness and a couple bugs.