fix buuuugs