adding nonnull to immuter
fix import
more fixes