Yet more changes to command line invocation

2 files changed, 7 insertions, 11 deletions

diff --git a/TODO.md b/TODO.md
index f856e4c..b886f7d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,18 +1,14 @@
 # To Do
 
-- Redesign command line interface to accomodate new features
-> Possible Idea:
-> schemer2 -format=xfce->img -in=terminalrc -out=image.png
-
+- Add advanced options for advanced manipulation of image generation
 
 - Support for following terminal inputs
-  + Xterm
-  + Urxvt
+  + Xterm (Partially done, needs more testing)
+  + Urxvt (See: xterm)
   + Mac Terminal
   + iTerm2
   + RoxTerm
   + Konsole
   + Plain text
-- Expose more advanced options for image generation
-- Write more tests
 
+- Write more tests and find existing configurations for terminals to test against
diff --git a/main.go b/main.go
index 4d40395..e7ba5e5 100644
--- a/main.go
+++ b/main.go
@@ -81,12 +81,12 @@ func main() {
 	}
 	if *format_string == "" {
 		fmt.Println("Input and output format must be specified using '-format' flag.")
-		usage()
+		flags_usage()
 		os.Exit(2)
 	}
 	if *infile == "" {
 		fmt.Println("Input file must be provided using '-in' flag.")
-		usage()
+		flags_usage()
 		os.Exit(2)
 	}
 	if *minBrightness > 255 || *maxBrightness > 255 {
@@ -106,7 +106,7 @@ func main() {
 	// And get colors from file using specified format
 	if len(strings.SplitN(*format_string, format_separator, 2)) < 2 {
 		fmt.Println("Invalid format string. Separate input and output formats with: '" + format_separator + "'")
-		usage()
+		flags_usage()
 		os.Exit(2)
 	}
 	input_format := strings.SplitN(*format_string, format_separator, 2)[0]