fix discov sorting
Merge remote-tracking branch 'upstream/master' into lc_working
issue #973

fixes #973
fix for scroll jumping on repaint
fix some things not refreshing

may make things a little bit laggier, but right now with the beast that
is the factory that can't seem to be helped.
Merge pull request #977 from LucidCrux/lc_working

Various Fixes