organizing + wall bug fix