some micro improvements