fixed some lazy programming