minor tweaks, next is color, I swear