Feature/fixing

It closes #16, it closes #17, it closes #18 and it closes #19