another userguide update and some small bug fixes