Cleanup and some minor fixes in mwan3track