- fixes from user requests