a lot of fixes to it
updates