fix + new features