update main master with working version changes