Added unimplemented methods and fixed errors