more cleaning up and moving stuff around