Add printing help, some cleanup