Committing some missed updates from the rewrite + some other fixes and updates, particularly relating to symbols.