Updated Trim methods

Also exporting missing types now.