small tweaks
changed r