Found some errors and fixed them