Made this somewhat more usable.

Please check my commits