Added comments and better hash parameters