FIX more & more bugs

FIX more & more bugs