Fixes

Fix rectangle, .equals for strings, parameterize comboboxes