Some stuff fixed.