fixed stuff to polish for beta release
merge