Buncha minor changes