Make help work and various help fixes