[ADD] several fixes