Fixed numerous inaccuracies pre-fork