more intial fixes