fix bugs YEAH!