Couple of bugfixes, got to think about primitives now