Major bugs solved