WIP: cleanup
WIP: scroll is broken