dev and fixes