make output more readable, added todo