Fix #437 #435
addressing comments
addressing more comments
Merge pull request #448 from antgonza/move-investigation-type

Fix #437 #435