lots of changes with functionality after first beta test