Fix some bugs, clean up, and readme changes

Review? @tariqislam :smile: