Updated

Fix some variables to use into DB and code.
Upgraded

A lot of changes as structures, code...