many fixes & updates

wow