fixing major issues
Fixing minor and info issues