Main rect
update
several minor tweaks