some more updates and move stuff around