formatting and small stuff. nbd