minor visual + structural fixes