fixing bugs, null checking