Updated userguide + some small tweaks