closes factor-io/console#516
closes factor-io/console#512