Better documentation, more improvements