fixed naming (finally!) and updated readme and some documentation