Cleaned up sets/gets and a few other changes

Merge request reports

Loading