fixed some slight issue