working on bug fixing and the move function