Fis some bugs.