eh, some more small stuff