Xend nut fix

x-end nut fix - separate M5 nut from bearing holder when possible, make six sided trap there.