Added more TODOs
Implemented stopping button
Typo + indentation fixes
Merge pull request #1 from krzys-h/master

Implemented stop button, fixed indentanion and typo.