fix bad formatting & errors >> master