small tweaks, additions, etc