1 click changes + bug fixes