more fixes for multistrike, couple of TODOs added