Working on some minor changes