fixes, probably working now