Few fixes, it's slow as hell...