Enabled strict, warnings; fixed circular imports