TODO
minor improvements