removed warnings and more cosmetix