Fixed a bunch errors on par with alpha developments.