fixed bugs (still signed issues)