some smalle dits to fix crash