Tons of fixes, improvements, generally works much better