just fixed some issues