Minor fixes and updated plots