* minor bbug fixes;