Adressing tab spacing and other minor nits