Added prev, next, first, last, self
Cleanup dev code