bug fixes

tabbed 1694-5 and commented out 421