Added in bridge

Fixed some tiny things too.