commenting formats; minor improvements; fixed user_distance bug