mulitple fixes