Fixed various bad decisions