Maaaany fixes and updates