added prev/next + cleanup