Code Update

Fixes, Addons, Extras... Some commits failed and i had to cancel them.