making fix namespace lineup more stuff