Included next/previous controls, fixed some inconsistencies

Removed some unneeded comments, added next/previous control options,
replaced advance function with set