CLI Fixes

#40 #39