Cleanup, move stuff around, add stop/pause