small updates, but still not fully working