Adds some more help, fixes some small bugs