latest, fixed bugs