Fixed over-agressive delegation, cleaned up code a little
3.0.1