second big update

basically done