polish + add stuff from before