added and fixed