Fixed a nasty bug with spaces in instance names

Also:  Cache and pack fixes