Added 1000x speed. Small fixes.