Manually fix what regex broke & what regex couldn't do

Signed-off-by: DziNeIT <dzineit@live.co.uk>