Added some -W flags, some cleanup