First round of bug fixes
Set fixed min-max values