Add string to date + fix nasty bug