fixing this and that