Loads of small and big fixes. Added pollhistory --delete yet again