Tidy Up

An updated version had been kicking around not uploaded for a while. So
far as I know everything in this works, but it could be beefed up with
extra options.