a couple of fixed and added things