fixes stuff
fixes regex
wip