Dev. note update and documentation improvement