fixed a few open issues