stashing
fix some bugs
safer use of channels, etc
better error handling and logging