minor improvements, still slow