Logic fixes and support for dresses