bug fixin and minor changes.