Fixed some demo bugs and implemented more primitives