stricter warnings; fix warnings