Update, Logic.

* Fixed bugs
AND MORE...