demo: fixing stuff here and there so that it looks nice