fixed some issues I maybe already fixed