minor changes which should have been commited a long time ago.