Fixed &POL(), Removed old todos