Updated more todo and added support for tblsp