Minor corrections
Types added