Almost done with some minor changes