update: latest updates on development branch; most of the source was updated