few fixes.. but still not working.