Fix TiC Tweaks

Also add in heart canister variables for later.