tweaks, thanks Kyle for feedback