fix min/max check
start adding some economy