fixed gov getters and added keys to good