cleanup & small stuff