tweaks to gii model and controller