Exceptions fixed. Packeges fixed.