fixed some methods