changes from 3.0
fixed bugs introduced during 3.0 merge
suggestion fixes