general improvments, build numbers, fixed issue #3