small mk fix
many fixings