Fixed a bad bug + added one good one!