fix ALL the bugs