fixed bugs and added non-functional move