bug fixes
Merge branch 'ryan'