misc bits and pieces
Merge pull request #215 from ParagonDevelopmentTeam/more_bits

misc bits and pieces