updates to contact crate, fix for storage, device