reduced some errors