renamed and fixed stuff