big update
big update

some errors still here