JSON bug fixed, few enhancements