General improvements, should use W more reliably now