A bug or two still needs fixed