Major bugs resolved