Fixed bugs!