-several fixes