Working on speed & some errors