ticket:5 many small changes