fixed all visible bugs