fixed NaN, added TODO's / to-tests
added icons