tweaks + changes