cleanup and small stuff