fixed bugs introduced from new features