diff --git a/framework/opengl_primitives/src/mm/opengl/frame_buffer_object.cpp b/framework/opengl_primitives/src/mm/opengl/frame_buffer_object.cpp
index f86460a..89691bb 100644
--- a/framework/opengl_primitives/src/mm/opengl/frame_buffer_object.cpp
+++ b/framework/opengl_primitives/src/mm/opengl/frame_buffer_object.cpp
@@ -24,6 +24,7 @@ void FrameBufferObject::bind(Target target) const {
 	}
 }
 
+// TODO: refactor, make depth and stencil set-able
 void FrameBufferObject::clear(float r, float g, float b, float a, GLbitfield target_mask) {
 	bind(FrameBufferObject::RW);
 
diff --git a/framework/opengl_primitives/src/mm/opengl/instance_buffer.hpp b/framework/opengl_primitives/src/mm/opengl/instance_buffer.hpp
index 5dd2154..a167f0a 100644
--- a/framework/opengl_primitives/src/mm/opengl/instance_buffer.hpp
+++ b/framework/opengl_primitives/src/mm/opengl/instance_buffer.hpp
@@ -19,7 +19,7 @@ namespace MM::OpenGL {
 	class InstanceBuffer {
 		private:
 			GLuint _handle;
-			size_t _size;
+			std::size_t _size;
 
 		public:
 			explicit InstanceBuffer(void) : _handle(0), _size(0) {
@@ -43,21 +43,21 @@ namespace MM::OpenGL {
 				glBindBufferBase(target, index, _handle);
 			}
 
-			void resize(size_t size, GLenum usage) {
+			void resize(std::size_t size, GLenum usage) {
 				glBindBuffer(GL_ARRAY_BUFFER, _handle);
 				glBufferData(GL_ARRAY_BUFFER, size * sizeof(TInstance), nullptr, usage);
 				_size = size;
 			}
 
-			size_t getSize(void) const {
+			std::size_t getSize(void) const {
 				return _size;
 			}
 
-			size_t getSizeBytes(void) const {
+			std::size_t getSizeBytes(void) const {
 				return _size * sizeof(TInstance);
 			}
 
-			TInstance* map(size_t size, GLenum usage = GL_DYNAMIC_DRAW, bool shrink = false) {
+			TInstance* map(std::size_t size, GLenum usage = GL_DYNAMIC_DRAW, bool shrink = false) {
 				if (size > _size || (shrink && (size < _size)))
 					resize(size, usage);
 
@@ -71,12 +71,21 @@ namespace MM::OpenGL {
 						GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_BUFFER_BIT
 					)
 				);
-				//auto* res = static_cast<TInstance*>(
-					//glMapBuffer(
-						//GL_ARRAY_BUFFER,
-						//GL_WRITE_ONLY
-					//)
-				//);
+
+				return res;
+			}
+
+			TInstance* mapRange(std::size_t offset, std::size_t size, GLbitfield access = GL_MAP_WRITE_BIT | GL_MAP_INVALIDATE_RANGE_BIT) {
+				glBindBuffer(GL_ARRAY_BUFFER, _handle);
+
+				auto* res = static_cast<TInstance*>(
+					glMapBufferRange(
+						GL_ARRAY_BUFFER,
+						offset * sizeof(TInstance),
+						size * sizeof(TInstance),
+						access
+					)
+				);
 
 				return res;
 			}
diff --git a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp
index 59e2d66..df1a15e 100644
--- a/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp
+++ b/framework/opengl_renderer/src/mm/opengl/render_tasks/simple_rect.cpp
@@ -56,17 +56,14 @@ SimpleRect::~SimpleRect(void) {
 void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
 	ZoneScopedN("MM::OpenGL::RenderTasks::SimpleRect::render");
 
-	rs.targets[target_fbo]->bind(FrameBufferObject::W);
+	rs.targets[target_fbo]->bind(FrameBufferObject::RW);
 
 	glEnable(GL_DEPTH_TEST);
 	glDepthFunc(GL_LESS);
 
 	_shader->bind();
-	_vertexBuffer->bind(GL_ARRAY_BUFFER);
 	_vao->bind();
 
-	//_shader->setUniform4f("_color", default_color);
-
 	auto& scene = engine.tryService<MM::Services::SceneServiceInterface>()->getScene();
 
 	Camera3D* cam = scene.try_ctx<Camera3D>();
@@ -94,7 +91,6 @@ void SimpleRect::render(Services::OpenGLRenderer& rs, Engine& engine) {
 	}
 
 	_vao->unbind();
-	_vertexBuffer->unbind(GL_ARRAY_BUFFER);
 	_shader->unbind();
 }