Fixed things, made reporting accurate, hopefully