UpdateMain

Added stuff to master bf br was merged.