Fixed Issue #2 and bug with chapter selector