Minor improvements to further the concepts :cat: