Attempting to get rdoc to work the way I want, some changes