many bugs fixed, still not working