Many features added, polished for new beta release