Almost fixin the fuckups