Fixed most (all?) of those bugs immediately