some changes towards release
fixed some qa issues