big fixex, improvements