Fixed: some small errors and test