1.0.0:Lou:13 more fixes