fixed a few methods