Lots of bug fixes for new special order form system