Minor changes, looking for errors and places for improvement