various small issues fixed;