fixed stuff...