Roll improvements. Closes #320