Misc little bugfixes, changed 'w' option to 'e' (for extra)