Improvements on design, details