Issue #15 quick fix

Quick fixes, tested to work for the 'checkout' command. May need work
for other commands. 

NOT extensively tested