Changed javadoc to normal; Added movement type checking