Crate Demo and necessary fixes