Big update!

thanks to thezoggy