Closes streams in settings
Hopefully better "testIsOver()"
Small fixes and clean up