updated and fixed stuff