Reintroduced choice, reintroduced error handling for non int arguments
Started working on a watch script, now includes (probably) broken queries :P
Merge remote-tracking branch 'origin/master'