additions and small tweaks