fixed a couple of known issues