additions & tweaks