(GP5) Some bugs fixed, still completely wrong