Some Additions and fixes.