minor tweaks, still needs work