Issue #87. Fixed some NotImplementedException and @TODO.