improvements after actual usage