Many imrprovements