testing with testling; minor fixes