Major bugs removed.