Better format of user input, documenting, fixes PR 6