minor (but ugly) fixes
removed stale code
now using all performance tricks

every trick in the book
even faster