Repaired lot of bugs...