Better handling of method names, some small improvements and documentation