Fix some stuff -- TODO: NUMBERRS ARE WRONG