A few bugs solved. Nothing major.