Implement instructions and small changes