Some fixes and makeup