everything works! YAY! now, for commenting and final tweaks