Made some minor changes, mainly just debugging/troubleshooting.