Refactorings in initializer, fixed few bugs.