rws bug fixes

several fixes