fixed bugs moving on finally