+ fixed bugs