micro fixes/improves