some last issues fixed