Many fixes, updates