fixed a few things - still not quite working and slow