fixed some override issues and a null pointer