rxlist fixes

mmmmm marbles
Merge pull request #116 from deebost/master

rxlist fixes