Improvements

builds on #3 for more goodness