move things around more
cleaning more up