added focuspoints

orientation doesn't work, but focuspoints are added. It broke the
bounding box though.

I also cleaned up a few files.