Minor fixes and cleanup, revert .gitignore.