Hardcode and minor tweaks