Add stubs for functions yet to be implemented
Add missing subtraction (so the type is actually returned correctly)