fix: cleaner
feature: additional display
merge dev