some more stuff, added help modal
merging