fixed bugs - updated