Bugfixes and nice notices