Fix stuff, more efficient