added and fixed stuff