Fixed a bug where content piped into stdin is ignored
Re-arranged metric order and added two new metrics