Fixed all known bugs, added better stats