Fixed library scrolling from one selection to next
Cleaned up commented sections & TODOs