added missing parameters, getters, private data