More combobox fun
Fixing rectangles better-like
Making tools compile!