A bunch of bugfixes and initial fast version. Still something wrong