Program update + lil tweaks