fixed some methods problems