Various minor changes and ideas