Polling now actually happens
various bugfixes and last minute stuff
Merge remote-tracking branch 'origin/fix_resgen'
res fix