More work on raypicking