whollcome bugfixes