fixed stuff!