joshlib compliance updates and a few bug fixes