Using Points and Surfaces to Improve Voxel-Based Non-rigid Registration