minor enhancements; fixed json representation