bugs removed, working