checkpoint

some small fixes made a few weeks back. will move from Blender 2.69 to
2.70 after this checkpoint