Fixed one bug, still incorrect.