Some refactoring + new features