removed debugging printout
refactored index method
refactored next/previous
Merge branch 'develop' into testing