More highlight options.
Better .gitignore.
Added TODO