comments and moving stuff around