added number of sets, improved unit tests and handled 404