Minor refactoring, added 2 buttons and more documentation.