regex fixes (some still not working)