Improvements and fixes in modeling wizard