couple of fixes, improvements, etc.