Add some help and argument checking