more bug fixes
all bug to current status fixed