Fixing comments, testing and bug fixes all properties except list for the new base code