Add some starter commands and fix null-return edge cases