penalty onclick bugfixes