Added min/max fix
Rename fix
Seems to work
Seems to work