adjusting parameter ranges, some cleanup