feature additions and fixes for v1.1.0 - koushik