various stability and user changes
Merge branch 'master' of https://github.com/asgpng/COS-iw