fixed bugs - yay