Small refactorings, bug fixes, addition of RefreshBundle