few fixed bugs