fixed some entry point and doctest issues