i broke some stuff with the last commit, fixed now