software/ors-amarisoft: cleanup and fixes

Fix JSON formatting which caused json_schema tests to fail, and other fixes and cleanups based on feedback from the previous merge request. /cc @tomo