Small fixes
Small changes
Made some internal variables mutable, so getters can be const.