[IMP] improved controls, style