internal testing and bug fixing complete submitted as version 2 beta 1