looking good, fixed null pointer exceptions