Updated readme and some locks improved