small changes from bugs / suggestions list