fixed collosal errors, welp