Updated small stuff