additional metadata, refactoring, performance enhancements

closes issue #8, progress on #7