add regex to check name + solve spacing issues