[20161024135436] Improved Instance Rolls and Bug Fixes