Fixed a couple bugs for you, going to bed zzzzz