errors and help refactoring
readability + section comments
borrowed test helper functions