Fixed some nits, still slower than original