restructuring and fixing, getting ready for something to release