Various minor changes and notes on things that require more attention