Add more comments and help output