Updating CLS up to function declarations

Including a little revision of function types and also a fresh PDF print.