the real second big update

basically done