Kinda big update.. :)