Couple more random 'bug' fixes. Mostly just things not quite working as intended