Added Support to add units

Units will now be shown.  Other small changes and cleanup