couple tweaks
standardize on cols, rows
fix makefile