Feature/just some fixes