More tweaks, still needs work