Add getters, change variable names, fix error