fixing bugs after moving stuff around