inline and other improvements