Merge pull request #64 from nolanfilter/Nolan

Minor prototype 4 fixes