Big Changes again! Bug fixes as well