minor bugfixes, short toast