Bunch of Code.

An Update, bug fixes and etc.