move stuff around, explain some issues