fixed bugs added new features