Some fixes and addings