bug fixes; indent style; libjsonz compatibility