fix urls
improve exception messages
code style