Minor fixes, less warning, => Version 1.0