Fined tuned things a little more, exiting is a bit cleaner and the
README has been updated a little.