[ADD] several fixes
[ADD] several fixes