Some fixes, some updates