fix: all functions complete (issues still persist)