Corrected and added stuff several places