Make some changes suggested by JR and justin