Some fixes... still need some refactorings