Better handling of strings
Protection against moving folders