Major update and some corrections for most of files to keep up with Alpha16.
resolved conflicts