fixed a few more tasks