0.0.2: cleaned up args handling a bit