moving in some fixes