Removed type constraints for primitives; fixed DERP bugs