fixed some bugs, removed typed