some changes: visibiltiy and fixes