Fixed 20020618-M02

Several changes to increase usability