done + some more