Speed ups to tsrv insertion.  Fix for application close error. closes #15