added concise method
added getters
bug fixes