small adjustments and error corrections