misc tweaks + additions