Minor improvements Closes #146, #127, #138, and inject-issues#23 See merge request inject/frontend!101