Initial commit
Some minor touchups