Several fixes implemented.