fixes, and, i'm back\!