Some fixes and added back support for w3mmd