it seems to work now
Late night bug fixes