- fixed bugs