fixed bugs added features