more changes, still not done yet :)