improve opening
adding a number of fixes