Added movement forgiveness and other small fixes