All bugs solved \o/