Updated some minor changes