Fixed: most warnings
...