moved some packages, cleaned up some code, fixed correct error messages for different urls