add inline variables and other minor changes