Fixed final shortcomings.