Minor changes (fixing compiler warnings updating terms etc)