Accessors rework, Functions.
Small improvements