Major fixes
Major fixes