Fixed bugs found after first play through.