fixed few things.. TT