fixed some pointed out things by haruna