Bug fixes for threading and splicing

Threading is now semi-stable