Minor fixes and new files.