Bug FIxes

I’ve been updating this in another project & forgot to update here in
it’s own repo!