january batch of changes
Merge pull request #5 from dmarges/jan-changes

january batch of changes