Many issues fixed