Misc. Fixes, changes, etc

Title.