Final push for the night. Just some random fixes.