Fixed whitespace, added primitives