some errors are fixed