fixing some uxd bugs