More changes and imporovements