Webtoon mode improvements
Improved cleanup (close #58)