fixing this that and the other