Fixing previous reverted issues + updated existing content