Fixed ALL the bugs!