Updated to fix minor issues