minor and big fix --kazu