1.0.0:Lou:14 various fixes