Heretic's Fork Hotfix- Some elbow grease on the code to fix crashes and improve build stability and overall performance