Some cleanup, and minus minus support now added.