fixed hella nil bugs