[FIX] copyright plus other minor fixes