variosu fixes ( will be properly rebased before merge