adding inline code, some fixes