big update

updated almost everything, 4 hours