added some primitives, fixed volume