fixed stuff..