Major Bug Fix and Feature adding