Fix some minor bug and implement the arrow thing  ... still not working