small fixes introdeced
updated to use commons library