JSON fix, bootstrap changes, service changes