Major Changes - Bug fixes