Error-checking, more ops implemented