fixed ubw stuff
fixed up ubw stuff and main reflects changes