Fix bugs, and wierd name thing