Minor fixes, added prefix option.