bugfixes and ud updates