some fixes
add up and stop to json