Features renamed and fixed