fixed some bugs feels quite useble again now